From e1dc4f7ae1f14c116a20c619cf3fd5f6fed69365 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 31 Mar 2017 00:15:08 +0100 Subject: [PATCH] meson: gdk: fix static library names Fix double lib prefix in filenames (liblibgdk-xyz.a) --- gdk/broadway/meson.build | 2 +- gdk/mir/meson.build | 2 +- gdk/quartz/meson.build | 2 +- gdk/wayland/meson.build | 2 +- gdk/win32/meson.build | 2 +- gdk/x11/meson.build | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build index 0e5b1c4312..b80e134d16 100644 --- a/gdk/broadway/meson.build +++ b/gdk/broadway/meson.build @@ -32,7 +32,7 @@ gdk_broadway_public_headers = [ gdk_broadway_deps = [shmlib] -libgdk_broadway = static_library('libgdk-broadway', +libgdk_broadway = static_library('gdk-broadway', gdk_broadway_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'], diff --git a/gdk/mir/meson.build b/gdk/mir/meson.build index 5c11162d95..9f45db449e 100644 --- a/gdk/mir/meson.build +++ b/gdk/mir/meson.build @@ -24,7 +24,7 @@ gdk_mir_deps = [ libcontent_hub_glib_dep, ] -libgdk_mir = static_library('libgdk-mir', +libgdk_mir = static_library('gdk-mir', gdk_mir_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'], diff --git a/gdk/quartz/meson.build b/gdk/quartz/meson.build index 6ee35b3b9d..0b01964b3f 100644 --- a/gdk/quartz/meson.build +++ b/gdk/quartz/meson.build @@ -39,7 +39,7 @@ install_headers('gdkquartz.h', subdir: 'gtk-4.0/gdk/') gdk_quartz_deps = [ # FIXME ] -libgdk_quartz = static_library('libgdk-quartz', +libgdk_quartz = static_library('gdk-quartz', gdk_quartz_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-xobjective-c'], diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build index b0d20ec473..f5e894cea9 100644 --- a/gdk/wayland/meson.build +++ b/gdk/wayland/meson.build @@ -82,7 +82,7 @@ foreach p : proto_sources command: [genprotocols, wayland_scanner, '@INPUT@', '@OUTPUT@', 'code']) endforeach -libgdk_wayland = static_library('libgdk-wayland', +libgdk_wayland = static_library('gdk-wayland', gdk_wayland_sources, gdk_wayland_gen_headers, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'], diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build index 452983a591..c99f60981b 100644 --- a/gdk/win32/meson.build +++ b/gdk/win32/meson.build @@ -43,7 +43,7 @@ install_headers('gdkwin32.h', subdir: 'gtk-4.0/gdk/') gdk_win32_deps = [ # FIXME ] -libgdk_win32 = static_library('libgdk-win32', +libgdk_win32 = static_library('gdk-win32', gdk_win32_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DINSIDE_GDK_WIN32'], diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build index 82e75d5f3d..065c1e444c 100644 --- a/gdk/x11/meson.build +++ b/gdk/x11/meson.build @@ -67,7 +67,7 @@ gdk_x11_deps = [ xinerama_dep, ] -libgdk_x11 = static_library('libgdk-x11', +libgdk_x11 = static_library('gdk-x11', gdk_x11_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'], -- 2.30.2